From: Hollis Blanchard <hollisb@us.ibm.com>
Date: Thu, 8 Feb 2007 00:53:33 +0000 (-0600)
Subject: [POWERPC][XEN] Fix mismerge.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15327^2~7
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=dd887f1615e6367ec83dd01a234df88bfada3227;p=xen.git

[POWERPC][XEN] Fix mismerge.
---

diff --git a/tools/libxc/xenguest.h b/tools/libxc/xenguest.h
index 2ae1fb287b..d2005201ce 100644
--- a/tools/libxc/xenguest.h
+++ b/tools/libxc/xenguest.h
@@ -142,4 +142,18 @@ int xc_set_hvm_param(
 int xc_get_hvm_param(
     int handle, domid_t dom, int param, unsigned long *value);
 
+/* PowerPC specific. */
+int xc_prose_build(int xc_handle,
+                   uint32_t domid,
+                   unsigned int mem_mb,
+                   const char *image_name,
+                   const char *ramdisk_name,
+                   const char *cmdline,
+                   const char *features,
+                   unsigned long flags,
+                   unsigned int store_evtchn,
+                   unsigned long *store_mfn,
+                   unsigned int console_evtchn,
+                   unsigned long *console_mfn);
+
 #endif /* XENGUEST_H */